Bug 1604377 - Convert key3.db files to key4.db in test data (following bug 1594931). r=mkmelin
authorPaul Morris <paul@thunderbird.net>
Tue, 17 Dec 2019 21:19:15 +0200
changeset 37767 fdf7ac32d1b28b64cf34510f73904fba08382473
parent 37766 680552a461aa0285eb83fe9d9ef2ffa9ddae471c
child 37768 bc93079edb4565cac8d0d0db152127021f397457
push id397
push userclokep@gmail.com
push dateMon, 10 Feb 2020 21:16:13 +0000
reviewersmkmelin
bugs1604377, 1594931
Bug 1604377 - Convert key3.db files to key4.db in test data (following bug 1594931). r=mkmelin
ldap/c-sdk/include/ldap_ssl.h
mailnews/db/gloda/test/unit/test_smime_mimemsg_representation.js
mailnews/test/data/db-tinderbox-invalid/key3.db
mailnews/test/data/db-tinderbox-invalid/key4.db
mailnews/test/data/key3.db
mailnews/test/data/key4.db
mailnews/test/resources/passwordStorage.js
--- a/ldap/c-sdk/include/ldap_ssl.h
+++ b/ldap/c-sdk/include/ldap_ssl.h
@@ -96,17 +96,17 @@ int LDAP_CALL ldapssl_install_routines(L
  * The parameters are as follows:
  * const char *certdbpath - path to the cert file.  This can be a shortcut
  *     to the directory name, if so cert7.db will be postfixed to the string.
  * void *certdbhandle - Normally this is NULL.  This memory will need
  *     to be freed.
  * int needkeydb - boolean.  Must be !=0 if client Authentication
  *     is required
  * char *keydbpath - path to the key database.  This can be a shortcut
- *     to the directory name, if so key3.db will be postfixed to the string.
+ *     to the directory name, if so key4.db will be postfixed to the string.
  * void *keydbhandle - Normally this is NULL, This memory will need
  *     to be freed
  * int needsecmoddb - boolean.  Must be !=0 to assure that the correct
  *     security module is loaded into memory
  * char *secmodpath - path to the secmod.  This can be a shortcut to the
  *    directory name, if so secmod.db will be postfixed to the string.
  *
  *  These three functions are mutually exclusive.  You can only call
--- a/mailnews/db/gloda/test/unit/test_smime_mimemsg_representation.js
+++ b/mailnews/db/gloda/test/unit/test_smime_mimemsg_representation.js
@@ -23,17 +23,17 @@ var msgGen = (gMessageGenerator = new Me
 var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
 var { MsgHdrToMimeMessage } = ChromeUtils.import(
   "resource:///modules/gloda/mimemsg.js"
 );
 
 function initNSS() {
   // Copy the NSS database files over.
   let profile = FileUtils.getDir("ProfD", []);
-  let files = ["cert8.db", "key3.db", "secmod.db"];
+  let files = ["cert8.db", "key4.db", "secmod.db"];
   let directory = do_get_file("../../../../data/db-tinderbox-invalid");
   for (let f of files) {
     let keydb = directory.clone();
     keydb.append(f);
     keydb.copyTo(profile, f);
   }
 
   // Ensure NSS is initialized.
deleted file mode 100644
index 417dd6196dc153884bf1520e46ad50b0e8b55530..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1b588f0f2d9834ed0149e1e38bbd28eb467934af
GIT binary patch
literal 294912
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
zQ)WH3GQX4i8!5|y?k}zEY>?as0000000000000000000000000000000000000000
z0000000000000000000t9Y2jWAYjSa0fFvZc3zO&2LJ#700000000000000000000
z00000000000000000000000000000000000Hzkcm3J7$+%g%F>`v3p{0000000000
z000000000000000000000000000000000000000000000;O6722@R-`1_ruQ*?ClQ
z9{>OV0000000000000000000000000000000000000000000000000000000+zgs&
zVgnrZ;rX_b+~To!+J}#}7TWUz-2<}ou;e}f000000000000000000000000000000
z0000000000000000000000000008*E7p5@>T-;oLdYa)W%fP^l*s{u)NzZO74+wUT
z>B@s8=R*_MObjg_ULO2gcM1Ri0000000000000000000000000000000000000000
z00000000000002se?pE<7h!h!kFb`Ojwvq5FW%Js)P!l%#`>>3xBqN$O-AdUEsrT(
zlqlauF%>;4&IZdtI$5KHYnw&a2hLygVs2JLx975tC~q9`dGAoNk1T7O^h)~cV~z(5
zckB)vY5uHR>?f{Bt*+bTP^r{DIA@q`T#k}xH5bIkCFUp|2BT4NO;R5A4Y*ui7oub;
zN$P2kV%F-@b`>8gN{gs^J99|c$LmviM=n*yOl~x7Q%$oeYchjJ*1I?Mk@ZTTufKPh
zPr%i=RzG6Q=GvxZ>6WR^E|F(y%GTUH^P{s*4oP}pQss8Xv$55+u1L)<_Ne@d9<A*g
z>oO1S^ZUL@r-QF8ubEospLd`*uj%9KK3KGPPAA>@8}+#F+jl<qS+PCq_`DgtOIFT3
zQJZ|O?*&swIm1~zzl*PHnX9djF6nZQdA1Tqj=}Js-^f0v`z8BN9e;0!lPBYv44mX>
z`f#bPZe^dMM-T5`d$zXa{WofINZGK?-#@$LQ`5NAmnPJ=J#p8pp@Eu$Dbt+uPHtFG
z`DL}Mt^CVP{+c^EGA6Wm@63b+2eogM%v|wSLci*>FLaDQurB1$xRx8sR$jVMlUWH5
ztTxUZ8Ixf9hj!D6{iDJ{PrSLsXGhSAti;>*WCnEzbbsu1&N9ha=B#(V@2qiF{?=bY
z0000000000000000000000000000000000000000000000000000000006+vB}fw?
zkFb`Ojwvq5*F|W$$))zeIm2w@a+E}?xgb6+F-P$*7>(Lr8dWr{HA!ML&sO5dF&KWd
O*e61h6!5dd%D(}in~GEb
deleted file mode 100644
index 64e1179dad3f2fed9e7cda16132d334cebc824db..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6b71ee5e71e9b79964835db72adc8f6599371540
GIT binary patch
literal 294912
zc%1Fj&2JoM836DZuf6_A9gu6}SjEa(>cK7%UGJ{Pwy;EP$894*lA1)&aIn_)mb%z+
zus11kRF+i2+=>KukU&+TQiVXMTtEo*P*AVj`Uk)vL_#3ys6}Pw-8d7spdxVr`S<h8
zGtayq&pe*B_X|&*U2ir@&undP)|;hj^vx)aqsL06D2h7Lvp32W)3fuw`#Ab&9nq&h
z^OyeCe$=x&8{N3wdgI1VZq#p_+<kj@cK6l)U_Sr=0000000000000000000000000
z000000002M|CNpI?xB&9_~xgY^_7jrW}{g@U2oP8u00D&i*pwjOBd(n&n}h@MoVMs
zYo!ZIXFfl-^mOTSi%*v>ojdc?rNz?ubESpz=N><MX5nIKY4O6@xrN13rS)cGbE18z
zj6d2_99kHOqxCCmjj!)~Z6h6Bu3u|zh5O}$`pXjsS?_$YI5adGe>p5z{c3%E?aI#1
zh3)n0^=6~{ZgXeOonHJ>DNJT9<O@n;^@(z2{IRZ3<BOrjMt!BRkuND8su3nXRHHin
zcxQ3wq0xA`-S)MW=NhZcd`Z`#8h5AvMJE&E3x(p)@WF4hzO!?!v7N8!JXEGV`=Kh+
z6XV}rio1tKN8^{a!bg@*=UK<0kL~^fAN|42&7WVoc&bz{r)T=P)hp>)&GImijZ9=i
z)7kBGb~_zzvnA8DEKFu0$--0?rn4}Ug?biN(l8TBmD@2?ELTEoKc^PrWQa+KQz1@=
zI1^$$#FY?NLu2js+Wm#R(#}KWN~l~3l`ElgB~-42%9T*L8g^B~u4>p-4ZEsgR}yBE
zFq?$gB+Mr5*-$eHHK)SL>2?fnF#M*Kay!rVRzkP6a;g$qzMF=39adMv>S|bBE4Np-
z7q&;LA=W~i3^99lEj+aro>~i^%VgL)8TL+=+auZD)y8DCR-K&4(@LJ+x1g4%lX;rt
z=~SLh-%FExTas@}@@+}JEjieh<n1JRJ4xP7lDCuO?Id|SN#0J9x09wbd0NlYl{{U|
z)3rQp<mof_((s4SPFM1FR<d^1ChO(3mGH)=%R&Brlkj(2nYlMGmA~bw+IY32IP}Em
zzx!g$|AUt&^1P6KefMPF;r;0uf8!rfdH?_b000000000000000000000000000000
z00000a8$h*#k-w@$Bz$0H^&ao3`VDp2T}SnFz|tWgLh~CD<|5Q&NzNKx?Db69xEPu
zWbetnclzT8y5d54xO4D(pMACer++^G;Dz73@tu<o&u`w@`_r#F;<&SPXLI<?7q0(o
z{Go5X{_gB6FaGG0OI!O>zuw;a?)9s$U4G$-U#4Y0v48k!@qzSV>5)A@j?>Y;Y_7E*
zwLY*O000000000000000000000000000000000000001vg6=|R?}_x<m!5I!y(m2Z
z00000000000000000000000000000000000007`fDiosLzVsTm-iy)$0000000000
z00000000000000000000000000001vq(UL;?Mtt5>rRv&00000000000000000000
z0000000000000000001R^b`vNy)Q?X`_eRS-HOr!0000000000000000000000000
z00000000000001vga-?!diM_x#r;`m{UAyY000000000000000000000000000000
z000000002^U$q=}jnr=TT&?fyJioQQ_J02#e(~4gAD(z?;n~}de(ciUul)Ase=N_I
z$BM@u*?V&Do&NZNuDDPh?i_sU_g{HwyxjcV%{TjR4LtnZyGy(8zughXogY6r`~CIT
zUb*$`>D%+K5B_+0wJ&{0-1=LT9smFU00000000000000000000000000000000000
TaHJe7jPzcu@9aFkwY~OFs|x>H
--- a/mailnews/test/resources/passwordStorage.js
+++ b/mailnews/test/resources/passwordStorage.js
@@ -10,15 +10,15 @@ if (typeof gDEPTH == "undefined") {
 
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 /**
  * Use the given storage database as the current signon database.
  * @returns Promise When the storage database is usable.
  */
 function setupForPassword(storageName) {
-  let keyDB = do_get_file(gDEPTH + "mailnews/data/key3.db");
-  keyDB.copyTo(do_get_profile(), "key3.db");
+  let keyDB = do_get_file(gDEPTH + "mailnews/data/key4.db");
+  keyDB.copyTo(do_get_profile(), "key4.db");
 
   let signons = do_get_file(gDEPTH + "mailnews/data/" + storageName);
   signons.copyTo(do_get_profile(), "logins.json");
   return Services.logins.initializationPromise;
 }